Allow to reset the property to its default value -1.

2005-01-14  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_set_search_column): Allow to
	reset the property to its default value -1.
	(gtk_tree_view_get_search_column): Return the default value in
	the g_return_val_if_fail() check.  (#163864, Richard Hult)

diff --git a/ChangeLog b/ChangeLog
index 73341521fab3b583bb50e3e4beba1200de610603..40c7b3c351ade1c5a5c76553a372205cac2dfd0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_column): Allow to
+       reset the property to its default value -1. 
+       (gtk_tree_view_get_search_column): Return the default value in
+       the g_return_val_if_fail() check.  (#163864, Richard Hult)
+
        * gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_value): 
        Add a translator hint.  (#163889)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 73341521fab3b583bb50e3e4beba1200de610603..40c7b3c351ade1c5a5c76553a372205cac2dfd0d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-01-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_column): Allow to
+       reset the property to its default value -1. 
+       (gtk_tree_view_get_search_column): Return the default value in
+       the g_return_val_if_fail() check.  (#163864, Richard Hult)
+
        * gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_value): 
        Add a translator hint.  (#163889)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 73341521fab3b583bb50e3e4beba1200de610603..40c7b3c351ade1c5a5c76553a372205cac2dfd0d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-01-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_column): Allow to
+       reset the property to its default value -1. 
+       (gtk_tree_view_get_search_column): Return the default value in
+       the g_return_val_if_fail() check.  (#163864, Richard Hult)
+
        * gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_value): 
        Add a translator hint.  (#163889)
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 09115f78e9a7648e7edb2a325c72d5db2300ccbb..836bd6f196a4435709db33f66ec0fd8764fb8df2 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12179,7 +12179,7 @@ gtk_tree_view_get_enable_search (GtkTreeView *tree_view)
 gint
 gtk_tree_view_get_search_column (GtkTreeView *tree_view)
 {
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), 0);
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
 
   return (tree_view->priv->search_column);
 }
@@ -12198,7 +12198,7 @@ gtk_tree_view_set_search_column (GtkTreeView *tree_view,
                                 gint         column)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (column >= 0);
+  g_return_if_fail (column >= -1);
 
   if (tree_view->priv->search_column == column)
     return;